Auto merge of #1540 - lfairy:strip-affixes, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 27 Apr 2015 16:55:30 +0000 (16:55 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Apr 2015 16:55:30 +0000 (16:55 +0000)
If the user invokes `cargo new` with a name of the form `rust-foo` or `foo-rs` (or any variation of the two), and the `--bin` option is *not* present, then the resulting `Cargo.toml` will have a `name` field of just `foo` instead.

Closes #1532


Trivial merge